This solves #102 and solves #2

This solves #102 and solves #2