Refactoring for cleanup
Testing stuff out
Switching back to BT
It works
Merge pull request #1 from lionelbarrow/master

Make it work