Further work on integrating everything