Add 2 scenes and some new shapes + binding missing classes