Started on new refactoring of assembler.