first day, working on cases
cleaned up a bit