Hippo

Merging my stuff to Master.