Huge Change

I will expand on changes later