Use new units and get to compile

Some of the units that cause problems are currently commented out.