Lots of changes for beta release 1