Refactored to use WIP directory