Finished porting over remaining code from the Assembler class