Compiles, but not super happy with this just yet...
Merge branch 'master' of github.com:jayridge/xfrmr