310 - Fixed. Need to write some tests now.