Commited Fire version. Still needs fixes.