attempt 1 at merging the android and webapp without a flood of errors