Development

merging massive changes from dev