Fixed the incldues
Moved some stuff around. not working, has a couple different implementations half built