Second Commit

Trying to repair half the problem