Starting to set up shared behaviors.
Removed un-needed args where possible.