Added infrastructure section

code is still a mess