PIP2-12 - Implement first mock-ups

https://jira.berkeley.edu/browse/PIP2-12