Add type to lists

... also, changes related to working on the SDK.

DON'T MERGE YET! TESTS STILL RUNNING!