finished moving parameter mapping to reflection class where it should be