Quick Commit

Started abstraction on the combat system.