And lets add a little bit more flexibility :)

Baby steps - eventually this will be fully modular and flexible :-D