Master

This is the master copy. works on v1, the weiro