Tweaks
Clean-up
Todo update
Big architectural update