Checking in local changes before converting this project to JavaScript