Ryanj branch pull request

code review needed