Still cleaning things up. Will sort out better commits soon.