First part of Version 2
Finished Kata, not happy but that's why it's a kata so I can improve...