Add new stuff v2.0

Mergable version of the other one.