Oct 22nd Refactor