Last large commit

Start of beta testing