First commit: with a lot of stuff