After pulling from Rufus. Now fixing errors and missing code