todos
test cleanup
moving rest of tasks into their own libraries