First part of #105