Revert "Started adding code"

This reverts commit 6733c227e26f81ba53b6b80031a9b7cd3c34d48c.
Revert "Revert "Started adding code""

This reverts commit 39ab173240979c170830d10dbf66a55d03d3cf3c.