Intermediate commit, functionality not fully implemented