Last push of changes. Gonna shelve for a bit.