Merged branches

Merge Code in from bf Milestone 3