Some reworking required on the abstractions, continuing work on the AWS Instance Manager