Added subtypes
Added simple powerup system