starting to port proposal features