still fixing stuff i broke =(