add org stuff and find-* functions