YEAH - Happy path of solving works!

Need to focus on some edge-cases