Revert "Revert "Bareboen project commit""

This reverts commit 51e4b8bf62d31ad79f621d2cba9b3aa8bf4245ea.