Began implementing locations and rep as well as some UI fixes