Added grounds concept as well as display and refactors