major refactor of predictions