Dev

these commits comprise my work from today.