Adds signatures
Adds huggybear to prepare for inheritance
Removes useless argument