Expanded data collection and added quick algorithm implementations