Moved make functionality to index
Added some checking functions