Revert "Revert 14e5b2b..1a279b0"

This reverts commit 85ae3e480df54e230ae92f55682195d4c628defd.

Conflicts:
	main.py