Added fire base service back in and todo directive.