Working now

Better than my last commit message anyway...