Additional prototyping for sandcastle