Wrapping up some TODOS, restructed data caching