Design changes, plist setup, Bec fucked up some code (commented out)