fix logic phew
flesh out comp