Accidentially committed some commented/not working code, fixed now