Finish up open branches. The goal is to have an example matter system to serve as an example