Added individual classes for each system

This helps individualize the systems, it’s messy but i think it will
help us in the long run.