Updated for 10.2.2

#23 Starting to work on this