Made it into a module
Added main module