Work in Progress Issue no.36

- WIP