Finished splitting out current work into separate files