First pass Funf v0.4 integration. Notifications + changes from master branch.