Rebase back to old code, add south