This cleaning up thing is drivin me crazy...
This cleaning up thing is drivin me crazy...still
Added specs for the rest
Some final comments so I remember where I was...