first pass at Unit 1 with newformat