First production build -- buggy though