Fix: Make Main useful again