Motor and battery ordered from PSWPower. A bit shy of 500 for both with shipping. Should be here in a few more days. Had to get a special wrench to get the bottom bracket off, but once in hand, it wasn't too bad. Ordered a topeake bar extender for the display and a longer cable for the speed...