lots of changes; started work on firebase module and edited thistle