Coding done, subtypes removed, testing in progress