Logic work.

 * added additional definitions
 * updated definitions
 * annotated
Merge pull request #7 from simensen/second

Logic work.