Some more basic work done.