Added simulation runner
Modified simulator desing