Updated - Closer to working version