Sunday Nite Clean Out

Interested in #9 , both of them.