Chris branch

Credits have been overhauled.
Still imperfect but much nicer looking than before