Adding in "default" stuff. Yay tests pass, now to add tests for new stuff.