Got 'em. Should be as it was.

Had to delete a lot of changes, but learned some stuff in the process.
Gonna fix it more, but this should all be working as intended, or at
least close to it.