cleaning up
merging this ship