WIP - Adding development environment support