More stuff

Commit 1

Commit 21