wip: work in progress, updates all around, and hardcoded some values for testing @wip