Did some work on the fb stuff