it's a bit spaghetti-ish, so I might as well re-do...