moving everything into this file will finish it tonight