Completed basic functionality, with add button