Cleanup
Assembling works
Added assembler