almost done!

Still a bug to fix in the inside