Reverted some changes and commented out some code while I debug. Working snapshot.