Changed from object constructor to just a regular old function. Also got rid of null outputs