inital commit
ready to go
fixing conflicts
setup script