Really close to working now