commented out some test stuff b/c they need updating