Can I just throw everything else together?

I kinda lost track of what I committed and what I didn't. I hope this
works :>