Resolved merge issues from the last commit. Let me know if things don't look right, I copied over the code from the previous commit (pre-merge) that was on Github.