Finish up basic working version