First commit: Current state of development