inital commit from tom