Added bunch of initial stuff