Almost Done

Finished up to #6.b