More work on fitting

Signed-off-by: Dustin Ngo (MacBook) <dustin.ngo@gmail.com>