More core mechanics added