diff --git a/src/abstractions/cipher.service.ts b/src/abstractions/cipher.service.ts
new file mode 100644
index 0000000000..d68aa99549
--- /dev/null
+++ b/src/abstractions/cipher.service.ts
@@ -0,0 +1,32 @@
+import { CipherData } from '../models/data';
+
+import { Cipher } from '../models/domain';
+import { Field } from '../models/domain';
+import { SymmetricCryptoKey } from '../models/domain';
+
+export interface CipherService {
+    decryptedCipherCache: any[];
+    clearCache(): void;
+    encrypt(model: any): Promise<Cipher>;
+    encryptFields(fieldsModel: any[], key: SymmetricCryptoKey): Promise<Field[]>;
+    encryptField(fieldModel: any, key: SymmetricCryptoKey): Promise<Field>;
+    get(id: string): Promise<Cipher>;
+    getAll(): Promise<Cipher[]>;
+    getAllDecrypted(): Promise<any[]>;
+    getAllDecryptedForGrouping(groupingId: string, folder?: boolean): Promise<any[]>;
+    getAllDecryptedForDomain(domain: string, includeOtherTypes?: any[]): Promise<any[]>;
+    getLastUsedForDomain(domain: string): Promise<any>;
+    updateLastUsedDate(id: string): Promise<void>;
+    saveNeverDomain(domain: string): Promise<void>;
+    saveWithServer(cipher: Cipher): Promise<any>;
+    saveAttachmentWithServer(cipher: Cipher, unencryptedFile: any): Promise<any>;
+    upsert(cipher: CipherData | CipherData[]): Promise<any>;
+    replace(ciphers: { [id: string]: CipherData; }): Promise<any>;
+    clear(userId: string): Promise<any>;
+    delete(id: string | string[]): Promise<any>;
+    deleteWithServer(id: string): Promise<any>;
+    deleteAttachment(id: string, attachmentId: string): Promise<void>;
+    deleteAttachmentWithServer(id: string, attachmentId: string): Promise<void>;
+    sortCiphersByLastUsed(a: any, b: any): number;
+    sortCiphersByLastUsedThenName(a: any, b: any): number;
+}
diff --git a/src/abstractions/folder.service.ts b/src/abstractions/folder.service.ts
index e02323115e..7de2430534 100644
--- a/src/abstractions/folder.service.ts
+++ b/src/abstractions/folder.service.ts
@@ -1,6 +1,6 @@
-import { FolderData } from '../models/data';
+import { FolderData } from '../models/data/folderData';
 
-import { Folder } from '../models/domain';
+import { Folder } from '../models/domain/folder';
 
 export interface FolderService {
     decryptedFolderCache: any[];
diff --git a/src/abstractions/index.ts b/src/abstractions/index.ts
index 476411d3c1..7ef441f0c3 100644
--- a/src/abstractions/index.ts
+++ b/src/abstractions/index.ts
@@ -1,5 +1,6 @@
 export { ApiService } from './api.service';
 export { AppIdService } from './appId.service';
+export { CipherService } from './cipher.service';
 export { CryptoService } from './crypto.service';
 export { EnvironmentService } from './environment.service';
 export { FolderService } from './folder.service';
diff --git a/src/services/cipher.service.ts b/src/services/cipher.service.ts
new file mode 100644
index 0000000000..364be57cac
--- /dev/null
+++ b/src/services/cipher.service.ts
@@ -0,0 +1,518 @@
+import { CipherType } from '../enums/cipherType';
+
+import { CipherData } from '../models/data/cipherData';
+
+import { Cipher } from '../models/domain/cipher';
+import { CipherString } from '../models/domain/cipherString';
+import { Field } from '../models/domain/field';
+import { SymmetricCryptoKey } from '../models/domain/symmetricCryptoKey';
+
+import { CipherRequest } from '../models/request/cipherRequest';
+
+import { CipherResponse } from '../models/response/cipherResponse';
+import { ErrorResponse } from '../models/response/errorResponse';
+
+import { ConstantsService } from './constants.service';
+
+import { ApiService } from '../abstractions/api.service';
+import { CipherService as CipherServiceInterface } from '../abstractions/cipher.service';
+import { CryptoService } from '../abstractions/crypto.service';
+import { SettingsService } from '../abstractions/settings.service';
+import { StorageService } from '../abstractions/storage.service';
+import { UserService } from '../abstractions/user.service';
+
+const Keys = {
+    ciphersPrefix: 'ciphers_',
+    localData: 'sitesLocalData',
+    neverDomains: 'neverDomains',
+};
+
+export class CipherService implements CipherServiceInterface {
+    static sortCiphersByLastUsed(a: any, b: any): number {
+        const aLastUsed = a.localData && a.localData.lastUsedDate ? a.localData.lastUsedDate as number : null;
+        const bLastUsed = b.localData && b.localData.lastUsedDate ? b.localData.lastUsedDate as number : null;
+
+        if (aLastUsed != null && bLastUsed != null && aLastUsed < bLastUsed) {
+            return 1;
+        }
+        if (aLastUsed != null && bLastUsed == null) {
+            return -1;
+        }
+
+        if (bLastUsed != null && aLastUsed != null && aLastUsed > bLastUsed) {
+            return -1;
+        }
+        if (bLastUsed != null && aLastUsed == null) {
+            return 1;
+        }
+
+        return 0;
+    }
+
+    static sortCiphersByLastUsedThenName(a: any, b: any): number {
+        const result = CipherService.sortCiphersByLastUsed(a, b);
+        if (result !== 0) {
+            return result;
+        }
+
+        const nameA = (a.name + '_' + a.username).toUpperCase();
+        const nameB = (b.name + '_' + b.username).toUpperCase();
+
+        if (nameA < nameB) {
+            return -1;
+        }
+        if (nameA > nameB) {
+            return 1;
+        }
+
+        return 0;
+    }
+
+    decryptedCipherCache: any[];
+
+    constructor(private cryptoService: CryptoService, private userService: UserService,
+        private settingsService: SettingsService, private apiService: ApiService,
+        private storageService: StorageService) {
+    }
+
+    clearCache(): void {
+        this.decryptedCipherCache = null;
+    }
+
+    async encrypt(model: any): Promise<Cipher> {
+        const cipher = new Cipher();
+        cipher.id = model.id;
+        cipher.folderId = model.folderId;
+        cipher.favorite = model.favorite;
+        cipher.organizationId = model.organizationId;
+        cipher.type = model.type;
+        cipher.collectionIds = model.collectionIds;
+
+        const key = await this.cryptoService.getOrgKey(cipher.organizationId);
+        await Promise.all([
+            this.encryptObjProperty(model, cipher, {
+                name: null,
+                notes: null,
+            }, key),
+            this.encryptCipherData(model, cipher, key),
+            this.encryptFields(model.fields, key).then((fields) => {
+                cipher.fields = fields;
+            }),
+        ]);
+
+        return cipher;
+    }
+
+    async encryptFields(fieldsModel: any[], key: SymmetricCryptoKey): Promise<Field[]> {
+        if (!fieldsModel || !fieldsModel.length) {
+            return null;
+        }
+
+        const self = this;
+        const encFields: Field[] = [];
+        await fieldsModel.reduce((promise, field) => {
+            return promise.then(() => {
+                return self.encryptField(field, key);
+            }).then((encField: Field) => {
+                encFields.push(encField);
+            });
+        }, Promise.resolve());
+
+        return encFields;
+    }
+
+    async encryptField(fieldModel: any, key: SymmetricCryptoKey): Promise<Field> {
+        const field = new Field();
+        field.type = fieldModel.type;
+
+        await this.encryptObjProperty(fieldModel, field, {
+            name: null,
+            value: null,
+        }, key);
+
+        return field;
+    }
+
+    async get(id: string): Promise<Cipher> {
+        const userId = await this.userService.getUserId();
+        const localData = await this.storageService.get<any>(Keys.localData);
+        const ciphers = await this.storageService.get<{ [id: string]: CipherData; }>(
+            Keys.ciphersPrefix + userId);
+        if (ciphers == null || !ciphers.hasOwnProperty(id)) {
+            return null;
+        }
+
+        return new Cipher(ciphers[id], false, localData ? localData[id] : null);
+    }
+
+    async getAll(): Promise<Cipher[]> {
+        const userId = await this.userService.getUserId();
+        const localData = await this.storageService.get<any>(Keys.localData);
+        const ciphers = await this.storageService.get<{ [id: string]: CipherData; }>(
+            Keys.ciphersPrefix + userId);
+        const response: Cipher[] = [];
+        for (const id in ciphers) {
+            if (ciphers.hasOwnProperty(id)) {
+                response.push(new Cipher(ciphers[id], false, localData ? localData[id] : null));
+            }
+        }
+        return response;
+    }
+
+    async getAllDecrypted(): Promise<any[]> {
+        if (this.decryptedCipherCache != null) {
+            return this.decryptedCipherCache;
+        }
+
+        const decCiphers: any[] = [];
+        const key = await this.cryptoService.getKey();
+        if (key == null) {
+            throw new Error('No key.');
+        }
+
+        const promises: any[] = [];
+        const ciphers = await this.getAll();
+        ciphers.forEach((cipher) => {
+            promises.push(cipher.decrypt().then((c: any) => {
+                decCiphers.push(c);
+            }));
+        });
+
+        await Promise.all(promises);
+        this.decryptedCipherCache = decCiphers;
+        return this.decryptedCipherCache;
+    }
+
+    async getAllDecryptedForGrouping(groupingId: string, folder: boolean = true): Promise<any[]> {
+        const ciphers = await this.getAllDecrypted();
+        const ciphersToReturn: any[] = [];
+
+        ciphers.forEach((cipher) => {
+            if (folder && cipher.folderId === groupingId) {
+                ciphersToReturn.push(cipher);
+            } else if (!folder && cipher.collectionIds != null && cipher.collectionIds.indexOf(groupingId) > -1) {
+                ciphersToReturn.push(cipher);
+            }
+        });
+
+        return ciphersToReturn;
+    }
+
+    async getAllDecryptedForDomain(domain: string, includeOtherTypes?: any[]): Promise<any[]> {
+        if (domain == null && !includeOtherTypes) {
+            return Promise.resolve([]);
+        }
+
+        const eqDomainsPromise = domain == null ? Promise.resolve([]) :
+            this.settingsService.getEquivalentDomains().then((eqDomains: any[][]) => {
+                let matches: any[] = [];
+                eqDomains.forEach((eqDomain) => {
+                    if (eqDomain.length && eqDomain.indexOf(domain) >= 0) {
+                        matches = matches.concat(eqDomain);
+                    }
+                });
+
+                if (!matches.length) {
+                    matches.push(domain);
+                }
+
+                return matches;
+            });
+
+        const result = await Promise.all([eqDomainsPromise, this.getAllDecrypted()]);
+        const matchingDomains = result[0];
+        const ciphers = result[1];
+        const ciphersToReturn: any[] = [];
+
+        ciphers.forEach((cipher) => {
+            if (domain && cipher.type === CipherType.Login && cipher.login.domain &&
+                matchingDomains.indexOf(cipher.login.domain) > -1) {
+                ciphersToReturn.push(cipher);
+            } else if (includeOtherTypes && includeOtherTypes.indexOf(cipher.type) > -1) {
+                ciphersToReturn.push(cipher);
+            }
+        });
+
+        return ciphersToReturn;
+    }
+
+    async getLastUsedForDomain(domain: string): Promise<any> {
+        const ciphers = await this.getAllDecryptedForDomain(domain);
+        if (ciphers.length === 0) {
+            return null;
+        }
+
+        const sortedCiphers = ciphers.sort(CipherService.sortCiphersByLastUsed);
+        return sortedCiphers[0];
+    }
+
+    async updateLastUsedDate(id: string): Promise<void> {
+        let ciphersLocalData = await this.storageService.get<any>(Keys.localData);
+        if (!ciphersLocalData) {
+            ciphersLocalData = {};
+        }
+
+        if (ciphersLocalData[id]) {
+            ciphersLocalData[id].lastUsedDate = new Date().getTime();
+        } else {
+            ciphersLocalData[id] = {
+                lastUsedDate: new Date().getTime(),
+            };
+        }
+
+        await this.storageService.save(Keys.localData, ciphersLocalData);
+
+        if (this.decryptedCipherCache == null) {
+            return;
+        }
+
+        for (let i = 0; i < this.decryptedCipherCache.length; i++) {
+            const cached = this.decryptedCipherCache[i];
+            if (cached.id === id) {
+                cached.localData = ciphersLocalData[id];
+                break;
+            }
+        }
+    }
+
+    async saveNeverDomain(domain: string): Promise<void> {
+        if (domain == null) {
+            return;
+        }
+
+        let domains = await this.storageService.get<{ [id: string]: any; }>(Keys.neverDomains);
+        if (!domains) {
+            domains = {};
+        }
+        domains[domain] = null;
+        await this.storageService.save(Keys.neverDomains, domains);
+    }
+
+    async saveWithServer(cipher: Cipher): Promise<any> {
+        const request = new CipherRequest(cipher);
+
+        let response: CipherResponse;
+        if (cipher.id == null) {
+            response = await this.apiService.postCipher(request);
+            cipher.id = response.id;
+        } else {
+            response = await this.apiService.putCipher(cipher.id, request);
+        }
+
+        const userId = await this.userService.getUserId();
+        const data = new CipherData(response, userId, cipher.collectionIds);
+        await this.upsert(data);
+    }
+
+    saveAttachmentWithServer(cipher: Cipher, unencryptedFile: any): Promise<any> {
+        const self = this;
+
+        return new Promise((resolve, reject) => {
+            const reader = new FileReader();
+            reader.readAsArrayBuffer(unencryptedFile);
+
+            reader.onload = async (evt: any) => {
+                const key = await self.cryptoService.getOrgKey(cipher.organizationId);
+                const encFileName = await self.cryptoService.encrypt(unencryptedFile.name, key);
+                const encData = await self.cryptoService.encryptToBytes(evt.target.result, key);
+
+                const fd = new FormData();
+                const blob = new Blob([encData], { type: 'application/octet-stream' });
+                fd.append('data', blob, encFileName.encryptedString);
+
+                let response: CipherResponse;
+                try {
+                    response = await self.apiService.postCipherAttachment(cipher.id, fd);
+                } catch (e) {
+                    reject((e as ErrorResponse).getSingleMessage());
+                    return;
+                }
+
+                const userId = await self.userService.getUserId();
+                const data = new CipherData(response, userId, cipher.collectionIds);
+                this.upsert(data);
+                resolve(new Cipher(data));
+
+            };
+
+            reader.onerror = (evt) => {
+                reject('Error reading file.');
+            };
+        });
+    }
+
+    async upsert(cipher: CipherData | CipherData[]): Promise<any> {
+        const userId = await this.userService.getUserId();
+        let ciphers = await this.storageService.get<{ [id: string]: CipherData; }>(
+            Keys.ciphersPrefix + userId);
+        if (ciphers == null) {
+            ciphers = {};
+        }
+
+        if (cipher instanceof CipherData) {
+            const c = cipher as CipherData;
+            ciphers[c.id] = c;
+        } else {
+            (cipher as CipherData[]).forEach((c) => {
+                ciphers[c.id] = c;
+            });
+        }
+
+        await this.storageService.save(Keys.ciphersPrefix + userId, ciphers);
+        this.decryptedCipherCache = null;
+    }
+
+    async replace(ciphers: { [id: string]: CipherData; }): Promise<any> {
+        const userId = await this.userService.getUserId();
+        await this.storageService.save(Keys.ciphersPrefix + userId, ciphers);
+        this.decryptedCipherCache = null;
+    }
+
+    async clear(userId: string): Promise<any> {
+        await this.storageService.remove(Keys.ciphersPrefix + userId);
+        this.decryptedCipherCache = null;
+    }
+
+    async delete(id: string | string[]): Promise<any> {
+        const userId = await this.userService.getUserId();
+        const ciphers = await this.storageService.get<{ [id: string]: CipherData; }>(
+            Keys.ciphersPrefix + userId);
+        if (ciphers == null) {
+            return;
+        }
+
+        if (typeof id === 'string') {
+            const i = id as string;
+            delete ciphers[id];
+        } else {
+            (id as string[]).forEach((i) => {
+                delete ciphers[i];
+            });
+        }
+
+        await this.storageService.save(Keys.ciphersPrefix + userId, ciphers);
+        this.decryptedCipherCache = null;
+    }
+
+    async deleteWithServer(id: string): Promise<any> {
+        await this.apiService.deleteCipher(id);
+        await this.delete(id);
+    }
+
+    async deleteAttachment(id: string, attachmentId: string): Promise<void> {
+        const userId = await this.userService.getUserId();
+        const ciphers = await this.storageService.get<{ [id: string]: CipherData; }>(
+            Keys.ciphersPrefix + userId);
+
+        if (ciphers == null || !ciphers.hasOwnProperty(id) || ciphers[id].attachments == null) {
+            return;
+        }
+
+        for (let i = 0; i < ciphers[id].attachments.length; i++) {
+            if (ciphers[id].attachments[i].id === attachmentId) {
+                ciphers[id].attachments.splice(i, 1);
+            }
+        }
+
+        await this.storageService.save(Keys.ciphersPrefix + userId, ciphers);
+        this.decryptedCipherCache = null;
+    }
+
+    async deleteAttachmentWithServer(id: string, attachmentId: string): Promise<void> {
+        try {
+            await this.apiService.deleteCipherAttachment(id, attachmentId);
+        } catch (e) {
+            return Promise.reject((e as ErrorResponse).getSingleMessage());
+        }
+        await this.deleteAttachment(id, attachmentId);
+    }
+
+    sortCiphersByLastUsed(a: any, b: any): number {
+        return CipherService.sortCiphersByLastUsed(a, b);
+    }
+
+    sortCiphersByLastUsedThenName(a: any, b: any): number {
+        return CipherService.sortCiphersByLastUsedThenName(a, b);
+    }
+
+    // Helpers
+
+    private encryptObjProperty(model: any, obj: any, map: any, key: SymmetricCryptoKey): Promise<void[]> {
+        const promises = [];
+        const self = this;
+
+        for (const prop in map) {
+            if (!map.hasOwnProperty(prop)) {
+                continue;
+            }
+
+            // tslint:disable-next-line
+            (function (theProp, theObj) {
+                const p = Promise.resolve().then(() => {
+                    const modelProp = model[(map[theProp] || theProp)];
+                    if (modelProp && modelProp !== '') {
+                        return self.cryptoService.encrypt(modelProp, key);
+                    }
+                    return null;
+                }).then((val: CipherString) => {
+                    theObj[theProp] = val;
+                });
+                promises.push(p);
+            })(prop, obj);
+        }
+
+        return Promise.all(promises);
+    }
+
+    private encryptCipherData(cipher: Cipher, model: any, key: SymmetricCryptoKey): Promise<any> {
+        switch (cipher.type) {
+            case CipherType.Login:
+                model.login = {};
+                return this.encryptObjProperty(cipher.login, model.login, {
+                    uri: null,
+                    username: null,
+                    password: null,
+                    totp: null,
+                }, key);
+            case CipherType.SecureNote:
+                model.secureNote = {
+                    type: cipher.secureNote.type,
+                };
+                return Promise.resolve();
+            case CipherType.Card:
+                model.card = {};
+                return this.encryptObjProperty(cipher.card, model.card, {
+                    cardholderName: null,
+                    brand: null,
+                    number: null,
+                    expMonth: null,
+                    expYear: null,
+                    code: null,
+                }, key);
+            case CipherType.Identity:
+                model.identity = {};
+                return this.encryptObjProperty(cipher.identity, model.identity, {
+                    title: null,
+                    firstName: null,
+                    middleName: null,
+                    lastName: null,
+                    address1: null,
+                    address2: null,
+                    address3: null,
+                    city: null,
+                    state: null,
+                    postalCode: null,
+                    country: null,
+                    company: null,
+                    email: null,
+                    phone: null,
+                    ssn: null,
+                    username: null,
+                    passportNumber: null,
+                    licenseNumber: null,
+                }, key);
+            default:
+                throw new Error('Unknown cipher type.');
+        }
+    }
+}
diff --git a/src/services/folder.service.ts b/src/services/folder.service.ts
index 6c51dafddc..a1ba9718ea 100644
--- a/src/services/folder.service.ts
+++ b/src/services/folder.service.ts
@@ -1,10 +1,10 @@
-import { FolderData } from '../models/data';
+import { FolderData } from '../models/data/folderData';
 
-import { Folder } from '../models/domain';
+import { Folder } from '../models/domain/folder';
 
-import { FolderRequest } from '../models/request';
+import { FolderRequest } from '../models/request/folderRequest';
 
-import { FolderResponse } from '../models/response';
+import { FolderResponse } from '../models/response/folderResponse';
 
 import { ApiService } from '../abstractions/api.service';
 import { CryptoService } from '../abstractions/crypto.service';
diff --git a/src/services/index.ts b/src/services/index.ts
index 4183aa784e..990af9022b 100644
--- a/src/services/index.ts
+++ b/src/services/index.ts
@@ -1,5 +1,6 @@
 export { ApiService } from './api.service';
 export { AppIdService } from './appId.service';
+export { CipherService } from './cipher.service';
 export { ConstantsService } from './constants.service';
 export { ContainerService } from './container.service';
 export { CryptoService } from './crypto.service';