Incorporate morning work before Calvin cleaned up repo