Added Enemy class, updated collision checking a bit