Ship almost completely commented, few issues remaining