Pretty much finished just need the final touches