Made changes, still needs tests