First Commit - semi-ready for static view demo