merge with profile
messed up
Revert "messed up"

This reverts commit 4ad6a422ad7409c9002286d17dfdee50bc3c400a.
Revert "merge with profile"

This reverts commit c2e86b86f2da8d5c32f24eb823d3d7239eada20b.
designing the flight storage model