more additions. nothing working yet. Will probably change in morning