Modified main class a little...and some other cpp files on accident..woops