Wip 2 - POWER!!!!

a lot of changes and tweaks