Most of the framework is done, almost ready to send the beta off