Skeleton mostly complete (need to fix new user button)