Finished resourcing up and getting tests to pass appropriately