added alfredo and solomons parts, needs cleanup