Major changes, still in heavy active development. See README notes