Added some more TODOs and re-org'ed this a bit

Had some thoughts on where I'd like to take this in the short term and in the long term. Re-org'ed based on those thoughts.