Syncing with bearded-computing

Brings in the latest add a resource options