Viciousesque/test branch

let's merge this sucker to master