Merge pull request #1 from adaam2/Development

Merging development progress
A raft of changes