Definitions and refs

fixes #20