saw a bunch of mistakes since last time, gonna fix em. still in progress