Tests and logic
APK + fixed gitignore