Major upgrade and update, also adding in missing files