Made changes. Tests now pass.