Bugfix, works sort of now. But am still changing order of things.