Added a bunch of changes to models and testing

Administration screen is halfway completed