things I needed to commit earlier
Added new file to change types
merge