ALmost done, issues with RasPi so pushing now just in case it crashes. Going in for test