intermediate commit, appended web_tier listeners, included unit-testing and stuff