More tweaking to make things pass checks and lint well but look ugly
More ugly