Initial XSLT commit, refactoring required