First commit, adding necessary stuff