Worked on power system some more