Continued work on intermed code gen