pre-alpha commit 8