Started working on API Key / Pass functionality