Some movement refactored, added rat