added handles to shape, moved shape into another class