Fleshing out basic functionality in the effected classes (And some
comments)