Version2 working

I'll mark them deprecated.