Preparing to expand to android