Reworked iOS Codebase