Cleaning up the code, home stretch now.
Finished everything now!