Updated functionality with working draft view.