Prototype

Resolved code review issues (#5 #6 #7 #8 )