Started implementing basic infrastructure