Amended spans to inputs

This is the long term fix for #14