Major Update

Everything Now works like it should