Adding a bunch of changes. -1 for the sorry commit msg