[UPD] Progress commit on client side code revamp