started all over, now a separate project
merged again