Initial work on implementing shape controls