Did some work/cleaning up. Need to fix a bug/implement shooting with the listeners.