Change stuff around for testing prompt. REVERT ME
Removed something to cause conflict.. REVERT ME
Merge branch 'conflicts-prompt'
Hopefully got it back to where it was