Adding semi-done version of prototype