Added some preliminary boilerplate
Modified more