changes, start on tests