merged everything into one file - should all work now