Inserted simple logging statements
Minor changes
Abandoned writer monad
Added TODO