added roles and expectations

Fixed a lot of the classes and added class. This project should be
working fine so far!