Update project to work with devtools

This branch will update the project to work with devtools.