Got a couple more functions working.