cleaned up, 1-12 are working, will add timing next