Added everything we have so far