[WIP] Separate everything