Consolidate lab into repo, some tweaks
Add lab into repo