What did I break now?
~~ fixed stash problems.... hopefully! ~~
Cleaned up functional tests