Matt Code Update

Updated some of the code Matt has been working on.