Began implementing SRP