misc refactoring
checkpoint the days work