Revert "#work - Add basic structure"

This reverts commit 75246ea1fe45217411eff17d1570e863c7dc6be7.
Revert "Revert "#work - Add basic structure""

This reverts commit 6f6c181fc6ff797c5c3776680da81f542b22a56e.