MANY changes... kinda buzzed right now