merge work that YAZ finished independently with the work that alberte and myself completed friday afternoon.

[jonathanschimpf]

merge all work that was completed apart from each other, check each other's local backups to ensure it's all streamlined. push to master.