some changes, almost done, just need to add projects