Fixed resources functionality
TODO: keychain saving + connecting to backend database