popups with test, DB improvements
Merge branch 'feature-function'