Some basic infrastructure

Some proposed infrastructure