Work on cleanup. Marked main TODOs and started on config file