Modified dev server to work with new code, added to repo