"merged things heavily, like all the ideas ... but the logic is not made up properly thats the problem"
Apparently, you reached a point where you need to do some code refactoring. It's rarely fun or exiting because it's work that doesn't add new features. But it's a necessary step if you want to continue expanding your project.