Big changes, still need to add projects