Add a few configurables
Link to Master for tests now