Adding side stream changes to Maemian. Working to integrate full upstream libraries...