Feature/kyle work

Updated