Commit before branch
Inheritance scheme and movement ai improved