Major changes

Started properly making progress