First round of changes

Initial features and infrastructure