lots o work, starting 5.4.3
updated tests
finished the layout and routes