merged with local changes
higher level features looking good
working on making predictions