Looks like all of these changes can actually be moved into our application.