Begin adding more initalization