Think this is pretty much done, thoughts?