status update; majority of code has been re-written/organized