Initial workings on the final implementation