Untested but looks really clean