Day commit

Not finished