Added fire button

And also some refactoring