Models and some bug fixes

Adds Models - closes #10
Fixes exclusion of un-annotated parameters
improvements to parameter types and return types