trying to fix merge errors and moved matt's weekly work