Commiting inital work, done summer 2012