Add rainbow and fix up stuff etc blah