Clayton: Changed some thing to use models and linq