cleared up some crap, branched off main to test