almost finished, except #branding

still need to work on #branding