Added some TODO's so I have a list of things I want to complete at the
very least before next update