V2

Sorry about this whole forking and not really knowing what I'm doing thing, still new to github. If you want, we can merge the project back into one to avoid confusion from people.