halfway through refactoring - lets check in and see what jenkins thinks