Brandon presenter3

- Added some test cases with out assertions, so I could see velocity engine output. 
- Did some refactoring
- Added #if for uihandlers