security-weekly: refactored some functions out. not ready