Implement more things.
Attempt to fix travis builds.