More packages and todo notes