More composition work, manily with monster ai.