Redo of kyles shit + cleanup