Added snippets and todos for pre-mockup stuff