v2

Added in support for lots of stuff