FIXED MVP MVP MVP MVP
big phat merge conflict dont break app plx plx plx