doing two things at once, eh? hmm feel like should be separate commit