first real commit
functionality updated