Updated structure; begin implementing analytics