checking in before smal refactor