FINISHED

I think I'm finished, checking functionality now