Major changes, nearly ready for first prototype