Initial checkin for handheld app