Friday update, about to possibly reorganize project