Modified a few classes and added them to the Abed module for a more cohesive feel.