Refactoring and slight improvements

System is a lot more 'standard' in how it works on the backend. Still
struggling with inline picker cells.