Remove all TODO's and start using type size

This is in preparation for custom types (again)