moved all locs to separate class