removing test comments
refactor - damage
Further Ship edits
Merge pull request #2 from jwhyte88/Developer

Developer