Added more general structure
dirty commit