cleaned up in the cake pattern + added som default cake slices to build on
changed some names and moved round a bit