New entity system, sketching out battle system some