work in progress
Properly update on window resizes