added old stuff I hadn't commited