Abstracting girder setup in separate module
Adding a TODO
Merge branch 'girder'