making progress for #42
making progresssss