Commit 37

Other stuff...