Working to spec. needs to be cleaned up.