Consolidating Paul's work into project