Code work and demo in progress