Cleaned up, added resume models