Last minute changes before another merge; adding API and power
systems...