Step 2 Actually Finished

See *_working.* files.