Barebones structure is in place
Acad/CS updated