Deven and Jason's stuff combined

A working version (however buggy) that includes both Jason's and Deven's
work thus far.