[wip] Improve project stuff