restart
Adding example
Added tests
finished manifest
got everything working again
fixed conflicts