MVP complete + 5 stretches + bug fix