starting to work on testing
merged changes from laptop