Done some cleanup, lets get this working