Started major code refactoring. New provisioning.