Cleaned up and added TODO's