Made templating and filled some basic stuff