added more basic infrastructure