Commit with my latest code, merging with the rest. ~zack
Recent merge of code. ~Zack