Baseline code

Basic testing done