Commited code for Dave, because, sure.