More work on deploy