Major Refactor of 'Popular' Class