Updated some changes and additions

Updating some initial work.