More work

Added more little boxes and such. Suggest we talk to Collins about
handling code. Having a few troubles.