Moar WIP
Reworked core builders a bit, added javadoc