big commit, and i have no clue what im doing

whatever