Refactoring and some experimental updatable properties

Probably starting to get too complex. Should bring it down to a fix set of columns. KISS.