Split states for modes into seperate files
final changes before deleting branch :D