Major changes for alpha release!