tmperry first commit - test and cleanup