clean up and added test data
holy fuck A5 isn't happening