Refractor base

Started rewriting the Data app to be way more awesom