Reworked, + some stuff actually working