Reworked project a bit