Added classes from hpop (also on Github) to project