Changing application for switchable demos; adding set representation class