fixed bugs, answered questions
trying to submit again
trying to get it submit
trying to get it to merge.
Merge