Final commit for initial prototype