Restructure everything. Define out tasks a bit more.