Trying to build, issues with lint, cleaning up.