Deleted things, reverting to base

We’ll think about frameworks later