Hpple test

Removed some boilerplate code and added a data model.