first commit
extra variables, remapping, etc