Cleaned up some more and added TODO