final commit

everything but the service page is done