Ek refactor review partials

under construction

# DONT MERGE