Major Update

Bugs and Scaling Issues but functional