Development

Finalizing the code.