Finished assembler, added builder code