Updating project to better isolate things