Basic outline working, boostrap update
Basic outline working, boostrap update