Space generation added, ship uses properties now
merge