Revert 13901c9..b5e514b

This rolls back to commit 13901c9ca8b9ea7bd2d297bec33194235255b974.
made a bunch of edits