first version
just comign into shape now