Done a handful of changes. Creatd a main class (should be moved to a different file)