notes updated
made it a bit more generic
updated for testing framework