Yep… Might be the right time to refactor this thing? ;)