Solved problem #004
Prettified #006, and added more content to #007