Marked done and added more TODO