Initial commit - v1 design implemented