Add definitions.
A little more progress...
Finally finish this... Closes #40.