Refactor offers a bit
Start working on an iOS port