I think this should probably go hand-in-hand with #5 and probably needs to be somewhat of a prerequisite for #23