BETA

Fixed and ready for full public BETA release