More work<
Cleanup + more