Hey! Sorry for the late response! The answer is the option B, the last two weeks were of rewriting and revising with new ideas I got. It was fun , but yeah, trying to put all the stuff together didn't "click" at the end and the "principal branch" was lost.
Tho I managed to rescue something for future use ;)!