Add bunch of things but not yet organized well