Starting to look pretty funtional. Need to add chartjs now