Last commit before i begin rewriting the power system