Moar TODO
Major schema redesign to make things more managable