Commit 1/?

Big update and GitHub is acting up again ffs