progress
Clean up some code; forEach sucks; now to just post to github