making next button fully non tanita
Base files are now in base project
unit tests abstracted, not passing thou