Some more work on build tool (#6)