Line up works for 90% + small overall changes

Lineup works for 90% > just have to fix adding from and until except of
dummy data