Initial commit of try to consolidate classes in iAndroic2014