Pr for 100

Redid branch so it can be merged