Make into an android library
Added no deletion