Tidied up, added status to resources