Aded some basic infrastructure