committing the code so far, even though it has some nice segfaults