major refactoring
got rid of stale edits