Adds deploy implementation
merged conflict