some cleanup until later. code currently nullpointers on startup