Demo and class v1 complete