Added support for static ip for non-VPC instance.  Still a WIP with some need to clean up.