I made a few tweaks to make everything work together and runnable
When I pulled, it broke a few things, so this fixes those things
This mostly changes things like accessibility modifiers and such