Already refactoring stuff from fe, jesus christ