Adding spec stubs, cleaned up. Will try to merge less commits.