Copying hw04 over to create hw05, retaining old status
Adjusting over to new setup
Got all block-style stuff working, need to do inline