Move everything to the static main
Streamline a lot more things