[DEV] seems to work on basic rework