Tons of updates. Redid a bunch of code. Notes... later?