WIP, adding failing tests. -Micah