Added development flag
Finished proper first version of the modal