Still not totally there, but added some functionality