Broke smaller object work into separate files