I'm willing to merge this one. just clean up the rest.