initial test commit
removed application context
minor changes
more merge conflicts