Push progress

Current progress at fixing ASM.