Probably won't be backwards compatible -- clean up core implementations to add functionality / usability