More work on build