Made a lot of progress with my part

Only the db connection left to do