mostly done.
updated with latest design edits from the boss