Updated for Beta 5 changes. Holy crap that took a while. Closes #18