Finished re-factor of old Wireless Remote, testing time