2nd Commit

All mock-ups done