Refactor/client side items #175