More work on basic stuff.