pre-alpha commit 6