committing many changes made over time. Not even sure what this will include.
adding customs
adding merge