Revert "Revert most tuna changes, leave kernel for now, will be revisited"

This reverts commit 4ae440eac96fb1e5693cadb7e9ca1e6a56589581.

Change-Id: I0f1844c155b899202eb4d57a6d2b8f0e2f830371
Signed-off-by: DHOMD <DHO@dho.im>