Done almost everything, time to test
Various fixes
Working nicely on v2