Changes

* Task description: Complete the mockups and code the functions

* Done by: Yong Seung Le (Mockups & initial code setup Part 1) and Darren Butcher (Coding, Revision and clean up Part 2), last bug fixes by Ivan Salazar

=== CText ===