Shifts were wrong
Implement some more stuff
Flesh out the color stuff
More display functions