merged correctly
merging ryan's stuff
merging ryan's stuff
asd
spawn-in effect
cleaned up some code
merge