Created new classes for demo UI, outlined tasks