Forgot to commit Base.cpp