AGHASDGASHDAS

Several commits, dunno, read commit comments.