More stuff.
Almost have initial implementation done.