Began working on backend management interface
Merged conflicted files