MASSIVE lint cleanup and added stage support.