Organize imports better to avoid some cirularity problems
Work on better way to type infer and lower math calls