2.1 hardline

Add hardline support, albeit preliminary, but should work fully. Fixes #34