Completes black diamon challenge
Fixes bugs and streamlines some code