Added initial working draft of generator and layouts