Cleaning up structure and starting on todo list.