Refactor some things, begin responsive stuff