Massive reworkings of internals
Get the basics working