Initial attempt at shapes thru annotations