Initial Contract Stuff (relates to #58)