Feature/initial cut

changed to JJ's suggestion