Huge Update, Most of the things are working now