Still working on improving accuracy, adding in saving