Refactored all old shit