Finished the logging in, the singleton isn't finished because it's inner classes are not complete, all that needs to be added after that is the persistence
Fixed a small bug that had to do with a listener