Some refactoring and dynamzing
Merge branch 'master' of https://github.com/Springsteen/TUES