Finished Firestorm revamp.

Will do strings tomorrow