More changes, almost runnable

DAMMIT SHIPMOD!!!