Cleaned up; moved tests - will have to finish them
Picked the more meaningful name