Feature/initial cut

done