Less test-like, more practical

Made it a module