working on fixin stuff