TW-castle wip 10-6-15