incrimental commit, working on tests