Start of redesign
fixed merge conflict