Add rotational dynamics, remove Shape class