working

but not decorated completely yet