adding stuff in to merge up to master to work on