Beta1

I think this is now complete, and ready for initial testing!