Bastion: Adding new resources, re-factoring and updating inline

edits for Systems.