[BROKEN] Some early changes

Currently in a broken state but here's what you should expect.