[WIP] iOS 7 Based Cleanup/Rewrite