Anddd complete! Not too hard at all! :)
Reverting 'bug' fix.
Big warning sign on the second solution