Tundra: Finish up initial implementation (untested)