Work in progress
Work on refactoring the code execution