Rearranging things
Make Update & Style base abstractions
Proceeding with new stuff
More unbroken refactoring