WIP: Once again, a ton of changes