committing for backup
added some more
merge