Adding a small infrastructure to work upon