Breakeverything

Make Andrew's code work with the rest of the code.