Continuing development of castaway class