Revert 2adff52..0821b01

This rolls back to commit 2adff527f0e38354fee3f0dbbfa5e01f8e6467a8.
sort of fixed temporarily and comments taken out