Fixin' up main class