Fixed and simplified callable. Finished out #11 with Line conversion