Huge commit, I took up the project again and decided to remove awfully written code (atleast some of it)