Implement #181 it actually looks better, and yes I'm inconsistent, sue me.