welp, forgot to keep commiting as I worked on these