Simplify way build works

- Let's not complicate matters more, KEEP IT SIMPLE FOR NOW