More some code outside of extension.

Signed-off-by: crynobone <crynobone@gmail.com>