Added Goal stubs, idented the code