Lots of junk changes, need to test before more features