tested and working for final turn in need to make some additional ui adjustments