Commented out alot of code to be able to build to test