WIP: improve deploy