Add Float and Integer support

This adds support for float and int types.  It appears to be working in my local testing.

However I think I found an unrelated(?) bug with this module in testing my changes, will explain in following comment.