Sticky fix
Sticky fix
Sticky fix and code simplification
Removed sticky. Added draft property instead. Probably shoudl have done this work on a branch
Packaged