Split work into sep page to prevent merge issues during testing phases