New Main file

Cleaned up. Doesn't compile properly though