First lint free build, need to add unit tests for better testing and functionality