Start over and simplify
Some more simplification and better structure
add preliminary build status listing