Last commit before adding major changes to power AGAIN