working on powerups stil..
merge