Some more additions, figuring things out as I go