90% done with tests/appointments, complete rehaul