Addedon stuff and some Android prototyping