add working, MVP complete