Trying out a different design
bug squashing and minor updates