safe commit before i start porting over to the iPhones