Would still like to see this cleaned up.