Work on Issues: #305, #284, #271, #241, #207, #176, #128, #103, #16