Fixed. Working on tests now.