Mark us configurator2

@danielstjules
This is my branch where I tried to add your suggestions. If you have any idea with the bug I have with stubbing ;)