Adding more stuff, still in utter chaos