Dev

merging progress. Pseudo Stable