Refactor level shit system shit