Got multiple shapes moving correctly