Final changes before moved to Backbone project.