working everything now