Refacted the client side constructure and added the steal into project.