- WIP
- Started to clean up before adding processing pipeline