Almost beta level

This should contain everything for the beta excluding animations. Only
thing left to put in.