Finished the initial split, assembler is more buggy now

Signed-off-by: Josh Kilmer <srjek2@gmail.com>