revert update, add prefix & suffix options, add to tests and OMG THEY PASS.