extension complete. Have to polish it and add UI tests