Plumbing

Todo, some potential areas