Divorced the application and haystack from each other, they now run side by side, but still linked.
Updated a few missed comments
Merge branch 'feature/clean-up' into develop