Everything is almost functional now