Finished

I haven't had time to do this over the week, so I coded as crazy frog today :]