Continued post delivery

Still a work in progress