add all the current stuff. still work to do