redoing most things

Everything is working the same, but im taking everything out of main