Holiday resync

Basic ship and power outline in place