Added remaining beta storage methods. Now to test and bugfix.