Done - Push for grade bug free. Memory needs looking into