Reworked, test coming next