New design, wohooo. Cleaned up the whole class also.