Add defaults and some changes
Add some IO crud