moved a couple things around and continued Client edit