Moved some stuff around, include portlet interceptor for phases