Created main and simple merge of logic and gui