Initial styles underway
Hand merged some stuff.