Revert 769b6be..402cc00

This rolls back to commit 769b6be9b29e51fa02be5a34c1e28db404d3ab7e.
Revert to before removing die from import function

Making changes to import as a class extension instead