Took out extra println's, pretty much done?