Committing half-finished autonomous stuff for Robert's benefit.
Merge origin/master
Committing half-finished autonomous stuff for Robert's benefit.