Changed up some stuff, added to my android draft