First stage of refactor done
Completed zepto refactor