Added some more stuff to mock-up