Merged editor with Matt's firebase post

Title says it all :)