Added build directory
Fiddling with variants.
Some ideas on data structures.