Added v2

Which is build with Kirby
Some changes
Some more changes