v1 working
Cleaner code
Merge conflicts
Remove <<<