Major fix

Change the whole project. Easier to code and develop now.