adding obj oriented hierarchy
things work, but first items in list are cut off
fixed wishlist
merged

Merge branch 'master' of https://github.com/elanas/Shuq