If we include squared terms can we do better?
tidy up naming and importing
giving up for now, since otherwiese I'lll have to do string handling in R. brrrr.