colour switching code, needs some animation timing added to get things switched at the right time
committing merge changes