Add noop function for testing
Add wait implementation
Port upgrade from bash