Big Update

Not sure how much of it was left, some major changes towards final prod