Closes #1 and Closes #3
Closes #5
Closes #2
Other additions to party and closes #4