* cleaning up bugs and finishing the first step