Will continue working on this on Sunday