Feature/initial cut

right forgot to do it for rest of them, will do now