Everything stored in models instead of tuples now (except for 2 exceptions)