Adding stuff from old Jellybean branch, stage 1