Adding Security Group support

Along with preliminary (failing) tests