Mob 757

@Hakubo @RafLeszcz - sorry for screwing the branch, could you perform a little sanity check before merging this?