Still a little buggy, need to add in lists