Finished!
Got rid of warning messages
Moving things around