Started work on new input data layout