WEB-658 - Initial Working Tools