Starting fixing Jason's issues