test

first 2 features completed