committing this so I can work on it over the weekend