More work on build process