#10 New refactor has begun.