Newest code, but won't run due to incomplete parsing function. (We'll work on this tonight or tomorrow)