Rework power system (still not hooked into anything)