Nick

I made some more changes that Josh will have to fix later