[@Partisan]

As dicsussed on skype, edits made and such.