diff --git a/bazaar/CtrlLibBoostPy/Button.cpp b/bazaar/CtrlLibBoostPy/Button.cpp
index 56213d7b4..c337c7fb9 100644
--- a/bazaar/CtrlLibBoostPy/Button.cpp
+++ b/bazaar/CtrlLibBoostPy/Button.cpp
@@ -3,11 +3,66 @@ using namespace boost::python;
 
 NAMESPACE_UPP
 
+class ButtonWrap : public Button, public wrapper<Button> {
+public:
+	typedef Button C;
+
+	virtual int OverPaint() const { if(override f = this->get_override("overpaint")) return f(); return C::OverPaint(); }
+	int default_OverPaint() const { return C::OverPaint(); }
+
+	virtual void MouseEnter(Point p, dword keyflags) { if(override f = this->get_override("mouseenter")) f(p, keyflags); C::MouseEnter(p, keyflags); }
+	void default_MouseEnter(Point p, dword keyflags) { C::MouseEnter(p, keyflags); }
+
+	virtual void MouseLeave() { if(override f = this->get_override("mouseleave")) f(); C::MouseLeave(); }
+	void default_MouseLeave() { C::MouseLeave(); }
+
+	virtual void GotFocus() { if(override f = this->get_override("gotfocus")) f(); C::GotFocus(); }
+	void default_GotFocus() { C::GotFocus(); }
+
+	virtual void LostFocus() { if(override f = this->get_override("lostfocus")) f(); C::LostFocus(); }
+	void default_LostFocus() { C::LostFocus(); }
+
+	virtual bool Key(dword key, int count) { if(override f = this->get_override("key")) return f(key, count); return C::Key(key, count); }
+	bool default_Key(dword key, int count) { return C::Key(key, count); }
+
+	virtual dword GetAccessKeys() const { if(override f = this->get_override("getaccesskeys")) return f(); return C::GetAccessKeys(); }
+	dword default_GetAccessKeys() const { return C::GetAccessKeys(); }
+
+	virtual void AssignAccessKeys(dword key) { if(override f = this->get_override("assignaccesskeys")) f(key); C::AssignAccessKeys(key); }
+	void default_AssignAccessKeys(dword key) { C::AssignAccessKeys(key); }
+
+	virtual bool HotKey(dword key) { if(override f = this->get_override("hotkey")) return f(key); return C::HotKey(key); }
+	bool default_HotKey(dword key) { return C::HotKey(key); }
+
+	virtual void Layout() { if(override f = this->get_override("layout")) f(); C::Layout(); }
+	void default_Layout() { C::Layout(); }
+};
+
+void ButtonOk(Button& c) { c.Ok(); }
+void ButtonCancel(Button& c) { c.Cancel(); }
+void ButtonExit(Button& c) { c.Exit(); }
+void ButtonNormal(Button& c) { c.Normal(); }
+
 void export_Button()
 {
 ONCELOCK
 {
 	class_<Button, bases<Pusher>, boost::noncopyable>("Button", "Upp Button")
+		.def("overpaint", &Button::OverPaint, &ButtonWrap::default_OverPaint)
+		.def("mouseenter", &Button::MouseEnter, &ButtonWrap::default_MouseEnter)
+		.def("mouseleave", &Button::MouseLeave, &ButtonWrap::default_MouseLeave)
+		.def("gotfocus", &Button::GotFocus, &ButtonWrap::default_GotFocus)
+		.def("lostfocus", &Button::LostFocus, &ButtonWrap::default_LostFocus)
+		.def("key", &Button::Key, &ButtonWrap::default_Key)
+		.def("getaccesskeys", &Button::GetAccessKeys, &ButtonWrap::default_GetAccessKeys)
+		.def("assignaccesskeys", &Button::AssignAccessKeys, &ButtonWrap::default_AssignAccessKeys)
+		.def("hotkey", &Button::HotKey, &ButtonWrap::default_HotKey)
+		.def("layout", &Button::Layout, &ButtonWrap::default_Layout)
+
+		.def("ok", &ButtonOk)
+		.def("ok", &ButtonCancel)
+		.def("ok", &ButtonExit)
+		.def("ok", &ButtonNormal)
 	;
 }
 }
diff --git a/bazaar/CtrlLibBoostPy/ButtonOption.cpp b/bazaar/CtrlLibBoostPy/ButtonOption.cpp
index 0de85b514..cf9100136 100644
--- a/bazaar/CtrlLibBoostPy/ButtonOption.cpp
+++ b/bazaar/CtrlLibBoostPy/ButtonOption.cpp
@@ -3,6 +3,38 @@ using namespace boost::python;
 
 NAMESPACE_UPP
 
+class ButtonOptionWrap : public ButtonOption, public wrapper<ButtonOption> {
+public:
+	typedef ButtonOption C;
+
+	virtual void SetData(const Value& data) { if(override f = this->get_override("setdata")) f(data); C::SetData(data); }
+	void default_SetData(const Value& data) { C::SetData(data); }
+
+	virtual Value GetData() const { if(override f = this->get_override("getdata")) return f(); return C::GetData(); }
+	Value default_GetData() const { return C::GetData(); }
+
+	virtual void MouseEnter(Point p, dword keyflags) { if(override f = this->get_override("mouseenter")) f(p, keyflags); C::MouseEnter(p, keyflags); }
+	void default_MouseEnter(Point p, dword keyflags) { C::MouseEnter(p, keyflags); }
+
+	virtual void MouseMove(Point p, dword keyflags) { if(override f = this->get_override("mousemove")) f(p, keyflags); C::MouseMove(p, keyflags); }
+	void default_MouseMove(Point p, dword keyflags) { C::MouseMove(p, keyflags); }
+
+	virtual void MouseLeave() { if(override f = this->get_override("mouseleave")) f(); C::MouseLeave(); }
+	void default_MouseLeave() { C::MouseLeave(); }
+
+	virtual void LeftDown(Point p, dword keyflags) { if(override f = this->get_override("leftdown")) f(p, keyflags); C::LeftDown(p, keyflags); }
+	void default_LeftDown(Point p, dword keyflags) { C::LeftDown(p, keyflags); }
+
+	virtual void LeftUp(Point p, dword keyflags) { if(override f = this->get_override("leftup")) f(p, keyflags); C::LeftUp(p, keyflags); }
+	void default_LeftUp(Point p, dword keyflags) { C::LeftUp(p, keyflags); }
+
+	virtual dword GetAccessKeys() const { if(override f = this->get_override("getaccesskeys")) return f(); return C::GetAccessKeys(); }
+	dword default_GetAccessKeys() const { return C::GetAccessKeys(); }
+
+	virtual void AssignAccessKeys(dword key) { if(override f = this->get_override("assignaccesskeys")) f(key); C::AssignAccessKeys(key); }
+	void default_AssignAccessKeys(dword key) { C::AssignAccessKeys(key); }
+};
+
 void ButtonOptionSetLabel(ButtonOption& c, const String& s) { c.SetLabel(s); }
 
 void export_ButtonOption()
@@ -10,7 +42,18 @@ void export_ButtonOption()
 ONCELOCK
 {
 	class_<ButtonOption, bases<Ctrl>, boost::noncopyable>("ButtonOption", "Upp ButtonOption")
+		.def("setdata", &ButtonOption::SetData, &ButtonOptionWrap::default_SetData)
+		.def("getdata", &ButtonOption::GetData, &ButtonOptionWrap::default_GetData)
+		.def("mouseenter", &ButtonOption::MouseEnter, &ButtonOptionWrap::default_MouseEnter)
+		.def("mousemove", &ButtonOption::MouseMove, &ButtonOptionWrap::default_MouseMove)
+		.def("mouseleave", &ButtonOption::MouseLeave, &ButtonOptionWrap::default_MouseLeave)
+		.def("leftdown", &ButtonOption::LeftDown, &ButtonOptionWrap::default_LeftDown)
+		.def("leftup", &ButtonOption::LeftUp, &ButtonOptionWrap::default_LeftUp)
+		.def("getaccesskeys", &ButtonOption::GetAccessKeys, &ButtonOptionWrap::default_GetAccessKeys)
+		.def("assignaccesskeys", &ButtonOption::AssignAccessKeys, &ButtonOptionWrap::default_AssignAccessKeys)
+
 		.add_property("label", &ButtonOption::GetLabel, &ButtonOptionSetLabel)
+		.add_property("data", &ButtonOption::Get, &ButtonOption::Set)
 	;
 }
 }
diff --git a/bazaar/CtrlLibBoostPy/CtrlCore.cpp b/bazaar/CtrlLibBoostPy/CtrlCore.cpp
index 6ea9f3fc3..a439c94f3 100644
--- a/bazaar/CtrlLibBoostPy/CtrlCore.cpp
+++ b/bazaar/CtrlLibBoostPy/CtrlCore.cpp
@@ -123,6 +123,9 @@ public:
 	virtual bool IsModified() const { if(override f = this->get_override("ismodified")) return f(); return C::IsModified(); }
 	bool default_IsModified() const { return C::IsModified(); }
 
+	virtual int OverPaint() const { if(override f = this->get_override("overpaint")) return f(); return C::OverPaint(); }
+	int default_OverPaint() const { return C::OverPaint(); }
+
 	virtual void CancelMode() { if(override f = this->get_override("cancelmode")) f(); C::CancelMode(); }
 	void default_CancelMode() { C::CancelMode(); }
 
@@ -378,6 +381,8 @@ ONCELOCK
 		.def("resetmodify", &Ctrl::ResetModify)
 		.def("ismodifiedset", &Ctrl::IsModifySet)
 
+		.def("overpaint", &Ctrl::OverPaint, &CtrlWrap::default_OverPaint)
+
 		.def("cancelmode", &Ctrl::CancelMode, &CtrlWrap::default_CancelMode)
 		.def("activate", &Ctrl::Activate, &CtrlWrap::default_Activate)
 		.def("deactivate", &Ctrl::Deactivate, &CtrlWrap::default_Deactivate)
diff --git a/bazaar/CtrlLibBoostPy/CtrlLibBoostPy.cpp b/bazaar/CtrlLibBoostPy/CtrlLibBoostPy.cpp
index 54cd05230..cfd0ae32d 100644
--- a/bazaar/CtrlLibBoostPy/CtrlLibBoostPy.cpp
+++ b/bazaar/CtrlLibBoostPy/CtrlLibBoostPy.cpp
@@ -15,12 +15,19 @@ ONCELOCK
 	export_Option();
 	export_Switch();
 
-	export_EditCtrl();
+	export_EditField();
+	export_EditString();
+	export_EditInt();
+	export_EditInt64();
+	export_EditDouble();
+
 	export_SliderCtrl();
 	export_Progress();
 
 	export_Prompts();
 
+	export_Foo();
+
 	//FIXME move outside, it's in bazaar
 	export_ValueCtrl();
 }
diff --git a/bazaar/CtrlLibBoostPy/CtrlLibBoostPy.h b/bazaar/CtrlLibBoostPy/CtrlLibBoostPy.h
index 190859554..59d3276ea 100644
--- a/bazaar/CtrlLibBoostPy/CtrlLibBoostPy.h
+++ b/bazaar/CtrlLibBoostPy/CtrlLibBoostPy.h
@@ -32,8 +32,20 @@ void export_Option();
 //Switch.cpp
 void export_Switch();
 
-//EditCtrl.cpp
-void export_EditCtrl();
+//EditField.cpp
+void export_EditField();
+
+//EditString.cpp
+void export_EditString();
+
+//EditInt.cpp
+void export_EditInt();
+
+//EditInt64.cpp
+void export_EditInt64();
+
+//EditDouble.cpp
+void export_EditDouble();
 
 //Progress.cpp
 void export_Progress();
@@ -41,6 +53,9 @@ void export_Progress();
 //SliderCtrl.cpp
 void export_SliderCtrl();
 
+//template.cpp
+void export_Foo();
+
 ///
 void export_CtrlLib();
 
diff --git a/bazaar/CtrlLibBoostPy/CtrlLibBoostPy.upp b/bazaar/CtrlLibBoostPy/CtrlLibBoostPy.upp
index a93ff574f..ba1e42f05 100644
--- a/bazaar/CtrlLibBoostPy/CtrlLibBoostPy.upp
+++ b/bazaar/CtrlLibBoostPy/CtrlLibBoostPy.upp
@@ -11,10 +11,15 @@ file
 	ButtonOption.cpp,
 	Option.cpp,
 	Switch.cpp,
+	EditField.cpp,
+	EditString.cpp,
+	EditInt.cpp,
+	EditInt64.cpp,
+	EditDouble.cpp,
+	template.cpp,
 	SliderCtrl.cpp,
 	ValueCtrl.h,
 	ValueCtrl.cpp,
-	EditCtrl.cpp,
 	Progress.cpp,
 	Misc.cpp,
 	CtrlLibBoostPy.h,
diff --git a/bazaar/CtrlLibBoostPy/EditCtrl.cpp b/bazaar/CtrlLibBoostPy/EditCtrl.cpp
index 183028449..d35bd9eac 100644
--- a/bazaar/CtrlLibBoostPy/EditCtrl.cpp
+++ b/bazaar/CtrlLibBoostPy/EditCtrl.cpp
@@ -7,38 +7,6 @@ void export_EditCtrl()
 {
 ONCELOCK
 {
-	class_<EditField, bases<Ctrl>, boost::noncopyable>("EditField", "Upp EditField")
-	;
-
-	class_<EditString, bases<EditField>, boost::noncopyable>("EditString", "Upp EditString")
-	;
-	class_<EditInt, bases<EditField>, boost::noncopyable>("EditInt", "Upp EditInt")
-	;
-	class_<EditInt64, bases<EditField>, boost::noncopyable>("EditInt64", "Upp EditInt64")
-	;
-	class_<EditDouble, bases<EditField>, boost::noncopyable>("EditDouble", "Upp EditDouble")
-	;
-	class_<EditStringNotNull, bases<EditString>, boost::noncopyable>("EditStringNotNull", "Upp EditStringNotNull")
-	;
-	class_<EditIntNotNull, bases<EditInt>, boost::noncopyable>("EditIntNotNull", "Upp EditIntNotNull")
-	;
-	class_<EditInt64NotNull, bases<EditInt64>, boost::noncopyable>("EditInt64NotNull", "Upp EditInt64NotNull")
-	;
-	class_<EditDoubleNotNull, bases<EditDouble>, boost::noncopyable>("EditDoubleNotNull", "Upp EditDoubleNotNull")
-	;
-
-	class_<EditIntSpin, bases<EditInt>, boost::noncopyable>("EditIntSpin", "Upp EditIntSpin")
-	;
-	class_<EditInt64Spin, bases<EditInt64>, boost::noncopyable>("EditInt64Spin", "Upp EditInt64Spin")
-	;
-	class_<EditDoubleSpin, bases<EditDouble>, boost::noncopyable>("EditDoubleSpin", "Upp EditDoubleSpin")
-	;
-	class_<EditIntNotNullSpin, bases<EditIntSpin>, boost::noncopyable>("EditIntNotNullSpin", "Upp EditIntNotNullSpin")
-	;
-	class_<EditInt64NotNullSpin, bases<EditInt64Spin>, boost::noncopyable>("EditInt64NotNullSpin", "Upp EditInt64NotNullSpin")
-	;
-	class_<EditDoubleNotNullSpin, bases<EditDoubleSpin>, boost::noncopyable>("EditDoubleNotNullSpin", "Upp EditDoubleNotNullSpin")
-	;
 }
 }
 
diff --git a/bazaar/CtrlLibBoostPy/EditDouble.cpp b/bazaar/CtrlLibBoostPy/EditDouble.cpp
new file mode 100644
index 000000000..8cb7db9af
--- /dev/null
+++ b/bazaar/CtrlLibBoostPy/EditDouble.cpp
@@ -0,0 +1,33 @@
+#include "Common.h"
+using namespace boost::python;
+
+NAMESPACE_UPP
+
+void EditDoubleSetMin(EditDouble& c, int m) { c.MinMax(m, c.GetMax()); }
+void EditDoubleSetMax(EditDouble& c, int m) { c.MinMax(c.GetMin(), m); }
+void EditDoubleSetNotNull(EditDouble& c, bool b) { c.NotNull(b); }
+
+void EditDoubleSpinSetInc(EditDoubleSpin& c, int m) { c.SetInc(m); }
+void EditDoubleSpinShowSpin(EditDoubleSpin& c, bool b) { c.ShowSpin(b); }
+
+void export_EditDouble()
+{
+ONCELOCK
+{
+	class_<EditDouble, bases<EditField>, boost::noncopyable>("EditDouble", "Upp EditDouble")
+		.add_property("max", &EditDouble::GetMax, &EditDoubleSetMax)
+		.add_property("min", &EditDouble::GetMin, &EditDoubleSetMin)
+		.add_property("notnull", &EditDouble::IsNotNull, &EditDoubleSetNotNull)
+	;
+	class_<EditDoubleNotNull, bases<EditDouble>, boost::noncopyable>("EditDoubleNotNull", "Upp EditDoubleNotNull")
+	;
+	class_<EditDoubleSpin, bases<EditDouble>, boost::noncopyable>("EditDoubleSpin", "Upp EditDoubleSpin")
+		.add_property("inc", &EditDoubleSpin::GetInc, &EditDoubleSpinSetInc)
+		.add_property("showspin", &EditDoubleSpin::IsSpinVisible, &EditDoubleSpinShowSpin)
+	;
+	class_<EditDoubleNotNullSpin, bases<EditDoubleSpin>, boost::noncopyable>("EditDoubleNotNullSpin", "Upp EditDoubleNotNullSpin")
+	;
+}
+}
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlLibBoostPy/EditField.cpp b/bazaar/CtrlLibBoostPy/EditField.cpp
new file mode 100644
index 000000000..b5ac9dfe0
--- /dev/null
+++ b/bazaar/CtrlLibBoostPy/EditField.cpp
@@ -0,0 +1,138 @@
+#include "Common.h"
+using namespace boost::python;
+
+NAMESPACE_UPP
+
+class EditFieldWrap : public EditField, public wrapper<EditField> {
+public:
+	typedef EditField C;
+
+	virtual void SetData(const Value& data) { if(override f = this->get_override("setdata")) f(data); C::SetData(data); }
+	void default_SetData(const Value& data) { C::SetData(data); }
+
+	virtual Value GetData() const { if(override f = this->get_override("getdata")) return f(); return C::GetData(); }
+	Value default_GetData() const { return C::GetData(); }
+
+	virtual void CancelMode() { if(override f = this->get_override("cancelmode")) f(); C::CancelMode(); }
+	void default_CancelMode() { C::CancelMode(); }
+
+	virtual void MouseEnter(Point p, dword keyflags) { if(override f = this->get_override("mouseenter")) f(p, keyflags); C::MouseEnter(p, keyflags); }
+	void default_MouseEnter(Point p, dword keyflags) { C::MouseEnter(p, keyflags); }
+
+	virtual void MouseMove(Point p, dword keyflags) { if(override f = this->get_override("mousemove")) f(p, keyflags); C::MouseMove(p, keyflags); }
+	void default_MouseMove(Point p, dword keyflags) { C::MouseMove(p, keyflags); }
+
+	virtual void LeftDown(Point p, dword keyflags) { if(override f = this->get_override("leftdown")) f(p, keyflags); C::LeftDown(p, keyflags); }
+	void default_LeftDown(Point p, dword keyflags) { C::LeftDown(p, keyflags); }
+
+	virtual void LeftDouble(Point p, dword keyflags) { if(override f = this->get_override("leftdouble")) f(p, keyflags); C::LeftDouble(p, keyflags); }
+	void default_LeftDouble(Point p, dword keyflags) { C::LeftDouble(p, keyflags); }
+
+	virtual void LeftTriple(Point p, dword keyflags) { if(override f = this->get_override("lefttriple")) f(p, keyflags); C::LeftTriple(p, keyflags); }
+	void default_LeftTriple(Point p, dword keyflags) { C::LeftTriple(p, keyflags); }
+
+	virtual void LeftDrag(Point p, dword keyflags) { if(override f = this->get_override("leftdrag")) f(p, keyflags); C::LeftDrag(p, keyflags); }
+	void default_LeftDrag(Point p, dword keyflags) { C::LeftDrag(p, keyflags); }
+
+	virtual void LeftUp(Point p, dword keyflags) { if(override f = this->get_override("leftup")) f(p, keyflags); C::LeftUp(p, keyflags); }
+	void default_LeftUp(Point p, dword keyflags) { C::LeftUp(p, keyflags); }
+
+	virtual void RightDown(Point p, dword keyflags) { if(override f = this->get_override("rightdown")) f(p, keyflags); C::RightDown(p, keyflags); }
+	void default_RightDown(Point p, dword keyflags) { C::RightDown(p, keyflags); }
+
+	virtual void MiddleDown(Point p, dword keyflags) { if(override f = this->get_override("middledown")) f(p, keyflags); C::MiddleDown(p, keyflags); }
+	void default_MiddleDown(Point p, dword keyflags) { C::MiddleDown(p, keyflags); }
+
+	virtual void MouseLeave() { if(override f = this->get_override("mouseleave")) f(); C::MouseLeave(); }
+	void default_MouseLeave() { C::MouseLeave(); }
+
+	virtual bool Key(dword key, int count) { if(override f = this->get_override("key")) return f(key, count); return C::Key(key, count); }
+	bool default_Key(dword key, int count) { return C::Key(key, count); }
+
+	virtual void GotFocus() { if(override f = this->get_override("gotfocus")) f(); C::GotFocus(); }
+	void default_GotFocus() { C::GotFocus(); }
+
+	virtual void LostFocus() { if(override f = this->get_override("lostfocus")) f(); C::LostFocus(); }
+	void default_LostFocus() { C::LostFocus(); }
+
+	virtual void Layout() { if(override f = this->get_override("layout")) f(); C::Layout(); }
+	void default_Layout() { C::Layout(); }
+
+	virtual Size GetMinSize() const { if(override f = this->get_override("getminsize")) return f(); return C::GetMinSize(); }
+	Size default_GetMinSize() const { return C::GetMinSize(); }
+};
+
+void EditFieldPassword(EditField& c, bool pwd) { c.Password(pwd); }
+void EditFieldAutoFormat(EditField& c, bool b) { c.AutoFormat(b); }
+void EditFieldClickSelect(EditField& c, bool b) { c.ClickSelect(b); }
+void EditFieldInitCaps(EditField& c, bool b) { c.InitCaps(b); }
+void EditFieldMaxChars(EditField& c, int mc) { c.MaxChars(mc); }
+void EditFieldNoBackground(EditField& c, bool b) { c.NoBackground(b); }
+void EditFieldAlignRight(EditField& c, bool b) { c.AlignRight(b); }
+
+void export_EditField()
+{
+ONCELOCK
+{
+	class_<EditField, bases<Ctrl>, boost::noncopyable>("EditField", "Upp EditField")
+
+		.def("setdata", &EditField::SetData, &EditFieldWrap::default_SetData)
+		.def("getdata", &EditField::GetData, &EditFieldWrap::default_GetData)
+		.def("cancelmode", &EditField::CancelMode, &EditFieldWrap::default_CancelMode)
+		.def("mouseenter", &EditField::MouseEnter, &EditFieldWrap::default_MouseEnter)
+		.def("mousemove", &EditField::MouseMove, &EditFieldWrap::default_MouseMove)
+		.def("leftdown", &EditField::LeftDown, &EditFieldWrap::default_LeftDown)
+		.def("leftdouble", &EditField::LeftDouble, &EditFieldWrap::default_LeftDouble)
+		.def("lefttriple", &EditField::LeftTriple, &EditFieldWrap::default_LeftTriple)
+		.def("leftdrag", &EditField::LeftDrag, &EditFieldWrap::default_LeftDrag)
+		.def("leftup", &EditField::LeftUp, &EditFieldWrap::default_LeftUp)
+		.def("rightdown", &EditField::RightDown, &EditFieldWrap::default_RightDown)
+		.def("middledown", &EditField::MiddleDown, &EditFieldWrap::default_MiddleDown)
+		.def("mouseleave", &EditField::MouseLeave, &EditFieldWrap::default_MouseLeave)
+		.def("key", &EditField::Key, &EditFieldWrap::default_Key)
+		.def("gotfocus", &EditField::GotFocus, &EditFieldWrap::default_GotFocus)
+		.def("lostfocus", &EditField::LostFocus, &EditFieldWrap::default_LostFocus)
+		.def("layout", &EditField::Layout, &EditFieldWrap::default_Layout)
+		.def("getminsize", &EditField::GetMinSize, &EditFieldWrap::default_GetMinSize)
+
+		.def("insert", (int (EditField::*)(int, const String&))&EditField::Insert)
+		.def("move", &EditField::Move)
+		.def("remove", &EditField::Remove)
+		.def("setselection", &EditField::SetSelection)
+		.def("getselection", &EditField::GetSelection)
+		.def("isselection", &EditField::IsSelection)
+		.def("removeselection", &EditField::RemoveSelection)
+		.def("cancelselection", &EditField::CancelSelection)
+
+		.def("copy", &EditField::Copy)
+		.def("undo", &EditField::Undo)
+		.def("cut", &EditField::Cut)
+		.def("paste", &EditField::Paste)
+		.def("erase", &EditField::Erase)
+		.def("selectall", &EditField::SelectAll)
+
+		.def_readwrite("whenenter", &EditField::WhenEnter)
+
+		.add_property("text", &EditField::operator String, (void (EditField::*)(const String&))&EditField::SetText)
+
+		.def("getlength", &EditField::GetLength)
+		.def("getchar", &EditField::GetChar)
+
+		.def("getraretrect", (Rect (EditField::*)() const)&EditField::GetCaretRect)
+		.def("clear", &EditField::Clear)
+		.def("reset", &EditField::Reset)
+
+		.def("error", &EditField::Error)
+
+		.add_property("password", &EditField::IsPassword, &EditFieldPassword)
+		.add_property("autoformat", &EditField::IsAutoFormat, &EditFieldAutoFormat)
+		.add_property("clickselect", &EditField::IsClickSelect, &EditFieldClickSelect)
+		.add_property("initcaps", &EditField::IsInitCaps, &EditFieldInitCaps)
+		.add_property("maxchars", &EditField::GetMaxChars, &EditFieldMaxChars)
+		.add_property("nobackground", &EditField::IsNoBackground, &EditFieldNoBackground)
+		.add_property("alignright", &EditField::IsAlignRight, &EditFieldAlignRight)
+	;
+}
+}
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlLibBoostPy/EditInt.cpp b/bazaar/CtrlLibBoostPy/EditInt.cpp
new file mode 100644
index 000000000..cae81127a
--- /dev/null
+++ b/bazaar/CtrlLibBoostPy/EditInt.cpp
@@ -0,0 +1,33 @@
+#include "Common.h"
+using namespace boost::python;
+
+NAMESPACE_UPP
+
+void EditIntSetMin(EditInt& c, int m) { c.MinMax(m, c.GetMax()); }
+void EditIntSetMax(EditInt& c, int m) { c.MinMax(c.GetMin(), m); }
+void EditIntSetNotNull(EditInt& c, bool b) { c.NotNull(b); }
+
+void EditIntSpinSetInc(EditIntSpin& c, int m) { c.SetInc(m); }
+void EditIntSpinShowSpin(EditIntSpin& c, bool b) { c.ShowSpin(b); }
+
+void export_EditInt()
+{
+ONCELOCK
+{
+	class_<EditInt, bases<EditField>, boost::noncopyable>("EditInt", "Upp EditInt")
+		.add_property("max", &EditInt::GetMax, &EditIntSetMax)
+		.add_property("min", &EditInt::GetMin, &EditIntSetMin)
+		.add_property("notnull", &EditInt::IsNotNull, &EditIntSetNotNull)
+	;
+	class_<EditIntNotNull, bases<EditInt>, boost::noncopyable>("EditIntNotNull", "Upp EditIntNotNull")
+	;
+	class_<EditIntSpin, bases<EditInt>, boost::noncopyable>("EditIntSpin", "Upp EditIntSpin")
+		.add_property("inc", &EditIntSpin::GetInc, &EditIntSpinSetInc)
+		.add_property("showspin", &EditIntSpin::IsSpinVisible, &EditIntSpinShowSpin)
+	;
+	class_<EditIntNotNullSpin, bases<EditIntSpin>, boost::noncopyable>("EditIntNotNullSpin", "Upp EditIntNotNullSpin")
+	;
+}
+}
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlLibBoostPy/EditInt64.cpp b/bazaar/CtrlLibBoostPy/EditInt64.cpp
new file mode 100644
index 000000000..f0cab36aa
--- /dev/null
+++ b/bazaar/CtrlLibBoostPy/EditInt64.cpp
@@ -0,0 +1,33 @@
+#include "Common.h"
+using namespace boost::python;
+
+NAMESPACE_UPP
+
+void EditInt64SetMin(EditInt64& c, int m) { c.MinMax(m, c.GetMax()); }
+void EditInt64SetMax(EditInt64& c, int m) { c.MinMax(c.GetMin(), m); }
+void EditInt64SetNotNull(EditInt64& c, bool b) { c.NotNull(b); }
+
+void EditInt64SpinSetInc(EditInt64Spin& c, int m) { c.SetInc(m); }
+void EditInt64SpinShowSpin(EditInt64Spin& c, bool b) { c.ShowSpin(b); }
+
+void export_EditInt64()
+{
+ONCELOCK
+{
+	class_<EditInt64, bases<EditField>, boost::noncopyable>("EditInt64", "Upp EditInt64")
+		.add_property("max", &EditInt64::GetMax, &EditInt64SetMax)
+		.add_property("min", &EditInt64::GetMin, &EditInt64SetMin)
+		.add_property("notnull", &EditInt64::IsNotNull, &EditInt64SetNotNull)
+	;
+	class_<EditInt64NotNull, bases<EditInt64>, boost::noncopyable>("EditInt64NotNull", "Upp EditInt64NotNull")
+	;
+	class_<EditInt64Spin, bases<EditInt64>, boost::noncopyable>("EditInt64Spin", "Upp EditInt64Spin")
+		.add_property("inc", &EditInt64Spin::GetInc, &EditInt64SpinSetInc)
+		.add_property("showspin", &EditInt64Spin::IsSpinVisible, &EditInt64SpinShowSpin)
+	;
+	class_<EditInt64NotNullSpin, bases<EditInt64Spin>, boost::noncopyable>("EditInt64NotNullSpin", "Upp EditInt64NotNullSpin")
+	;
+}
+}
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlLibBoostPy/EditString.cpp b/bazaar/CtrlLibBoostPy/EditString.cpp
new file mode 100644
index 000000000..14a541f1d
--- /dev/null
+++ b/bazaar/CtrlLibBoostPy/EditString.cpp
@@ -0,0 +1,26 @@
+#include "Common.h"
+using namespace boost::python;
+
+NAMESPACE_UPP
+
+void EditStringMaxLen(EditString& c, int m) { c.MaxLen(m); }
+void EditStringTrimLeft(EditString& c, bool b) { c.TrimLeft(b); }
+void EditStringTrimRight(EditString& c, bool b) { c.TrimRight(b); }
+void EditStringSetNotNull(EditString& c, bool b) { c.NotNull(b); }
+
+void export_EditString()
+{
+ONCELOCK
+{
+	class_<EditString, bases<EditField>, boost::noncopyable>("EditString", "Upp EditString")
+		.add_property("maxlen", &EditString::GetMaxLength, &EditStringMaxLen)
+		.add_property("trimleft", &EditString::IsTrimLeft, &EditStringTrimLeft)
+		.add_property("trimright", &EditString::IsTrimRight, &EditStringTrimRight)
+		.add_property("notnull", &EditString::IsNotNull, &EditStringSetNotNull)
+	;
+	class_<EditStringNotNull, bases<EditString>, boost::noncopyable>("EditStringNotNull", "Upp EditStringNotNull")
+	;
+}
+}
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlLibBoostPy/Option.cpp b/bazaar/CtrlLibBoostPy/Option.cpp
index 46effb95b..2f5853eda 100644
--- a/bazaar/CtrlLibBoostPy/Option.cpp
+++ b/bazaar/CtrlLibBoostPy/Option.cpp
@@ -3,22 +3,75 @@ using namespace boost::python;
 
 NAMESPACE_UPP
 
+class OptionExpose : public Option
+{
+public:
+	typedef Option P;
+
+	inline virtual void RefreshPush() { return P::RefreshPush(); }
+	inline virtual void RefreshFocus() { return P::RefreshFocus(); }
+	inline virtual void PerformAction() { return P::PerformAction(); }
+};
+
+class OptionWrap : public Option, public wrapper<Option> {
+public:
+	typedef Option C;
+
+	virtual Size GetMinSize() const { if(override f = this->get_override("getminsize")) return f(); return C::GetMinSize(); }
+	Size default_GetMinSize() const { return C::GetMinSize(); }
+
+	virtual void SetData(const Value& data) { if(override f = this->get_override("setdata")) f(data); C::SetData(data); }
+	void default_SetData(const Value& data) { C::SetData(data); }
+
+	virtual Value GetData() const { if(override f = this->get_override("getdata")) return f(); return C::GetData(); }
+	Value default_GetData() const { return C::GetData(); }
+
+	virtual void MouseEnter(Point p, dword keyflags) { if(override f = this->get_override("mouseenter")) f(p, keyflags); C::MouseEnter(p, keyflags); }
+	void default_MouseEnter(Point p, dword keyflags) { C::MouseEnter(p, keyflags); }
+
+	virtual void MouseLeave() { if(override f = this->get_override("mouseleave")) f(); C::MouseLeave(); }
+	void default_MouseLeave() { C::MouseLeave(); }
+
+	//own
+	virtual void RefreshPush() { if(override f = this->get_override("refreshpush")) f(); C::RefreshPush(); }
+	void default_RefreshPush() { C::RefreshPush(); }
+
+	virtual void RefreshFocus() { if(override f = this->get_override("refreshfocus")) f(); C::RefreshFocus(); }
+	void default_RefreshFocus() { C::RefreshFocus(); }
+
+	virtual void PerformAction() { if(override f = this->get_override("performaction")) f(); C::PerformAction(); }
+	void default_PerformAction() { C::PerformAction(); }
+};
+
 void OptionBlackEdge(Option& o, bool b) { o.BlackEdge(b); }
 void OptionSwitchImage(Option& o, bool b) { o.SwitchImage(b); }
 void OptionThreeState(Option& o, bool b) { o.ThreeState(b); }
 void OptionShowLabel(Option& o, bool b) { o.ShowLabel(b); }
 void OptionNotNull(Option& o, bool b) { o.NotNull(b); }
+void OptionSet(Option& o, int b) { o.Set(b); }
 
 void export_Option()
 {
 ONCELOCK
 {
 	class_<Option, bases<Pusher>, boost::noncopyable>("Option", "Upp Option")
+		.def("getminsize", &Option::GetMinSize, &OptionWrap::default_GetMinSize)
+		.def("setdata", &Option::SetData, &OptionWrap::default_SetData)
+		.def("getdata", &Option::GetData, &OptionWrap::default_GetData)
+		.def("mouseenter", &Option::MouseEnter, &OptionWrap::default_MouseEnter)
+		.def("mouseleave", &Option::MouseLeave, &OptionWrap::default_MouseLeave)
+
+		.def("refreshpush", (void (Option::*)())&OptionExpose::RefreshPush, &OptionWrap::default_RefreshPush)
+		.def("refreshfocus", (void (Option::*)())&OptionExpose::RefreshFocus, &OptionWrap::default_RefreshFocus)
+		.def("performaction", (void (Option::*)())&OptionExpose::PerformAction, &OptionWrap::default_PerformAction)
+
 		.add_property("blackedge", &Option::IsBlackEdge, &OptionBlackEdge)
 		.add_property("switchimage", &Option::IsSwitchImage, &OptionSwitchImage)
 		.add_property("threestate", &Option::IsThreeState, &OptionThreeState)
 		.add_property("showlabel", &Option::IsShowLabel, &OptionShowLabel)
 		.add_property("notnull", &Option::IsNotNull, &OptionNotNull)
+
+		.add_property("data", &Option::Get, &OptionSet)
 	;
 }
 }
diff --git a/bazaar/CtrlLibBoostPy/Pusher.cpp b/bazaar/CtrlLibBoostPy/Pusher.cpp
index 4aac30a8d..e78308ff4 100644
--- a/bazaar/CtrlLibBoostPy/Pusher.cpp
+++ b/bazaar/CtrlLibBoostPy/Pusher.cpp
@@ -3,6 +3,29 @@ using namespace boost::python;
 
 NAMESPACE_UPP
 
+//a dirty hack to expose protected virtuals
+//more see bellow
+class PusherExpose : public Pusher
+{
+public:
+	typedef Pusher P;
+
+#if 0 // only worked for gcc, without the cast hack bellow
+	using P::RefreshPush;
+	using P::RefreshFocus;
+	using P::PerformAction;
+#endif
+
+	inline virtual void RefreshPush() { return P::RefreshPush(); }
+	inline virtual void RefreshFocus() { return P::RefreshFocus(); }
+	inline virtual void PerformAction() { return P::PerformAction(); }
+
+	inline void KeyPush() { P::KeyPush(); }
+	inline bool IsPush() const { return P::IsPush(); }
+	inline bool IsKeyPush() { return P::IsKeyPush(); }
+	inline bool FinishPush() { return P::FinishPush(); }
+};
+
 class PusherWrap : public Pusher, public wrapper<Pusher> {
 public:
 	typedef Pusher C;
@@ -82,9 +105,23 @@ ONCELOCK
 		.def("assignaccesskeys", &Pusher::AssignAccessKeys, &PusherWrap::default_AssignAccessKeys)
 		.def("hotkey", &Pusher::HotKey, &PusherWrap::default_HotKey)
 
-//		.def("refreshpush", &Pusher::RefreshPush, &PusherWrap::default_RefreshPush)
-//		.def("refreshfocus", &Pusher::RefreshFocus, &PusherWrap::default_RefreshFocus)
-//		.def("performaction", &Pusher::PerformAction, &PusherWrap::default_PerformAction)
+		.def("refreshpush", (void (Pusher::*)())&PusherExpose::RefreshPush, &PusherWrap::default_RefreshPush)
+		.def("refreshfocus", (void (Pusher::*)())&PusherExpose::RefreshFocus, &PusherWrap::default_RefreshFocus)
+		.def("performaction", (void (Pusher::*)())&PusherExpose::PerformAction, &PusherWrap::default_PerformAction)
+
+		.def("keypush", (void (Pusher::*)())&PusherExpose::KeyPush)
+		.def("ispush", (bool (Pusher::* const)())&PusherExpose::IsPush)
+		.def("iskeypush", (bool (Pusher::*)())&PusherExpose::IsKeyPush)
+		.def("finishpush", (bool (Pusher::*)())&PusherExpose::FinishPush)
+
+		.add_property("clickfocus", &Pusher::IsClickFocus, &PusherClickFocus)
+		.add_property("label", &Pusher::GetLabel, &PusherSetLabel)
+
+		.def("pseudopush", &Pusher::PseudoPush)
+		.def("getvisualstate", &Pusher::GetVisualState)
+		
+		.def_readwrite("whenpush", &Pusher::WhenPush)
+		.def_readwrite("whenrepeat", &Pusher::WhenRepeat)
 	;
 }
 }
diff --git a/bazaar/CtrlLibBoostPy/Switch.cpp b/bazaar/CtrlLibBoostPy/Switch.cpp
index d3c2345ca..7881db9bd 100644
--- a/bazaar/CtrlLibBoostPy/Switch.cpp
+++ b/bazaar/CtrlLibBoostPy/Switch.cpp
@@ -3,13 +3,83 @@ using namespace boost::python;
 
 NAMESPACE_UPP
 
+class SwitchWrap : public Switch, public wrapper<Switch> {
+public:
+	typedef Switch C;
+
+	virtual void CancelMode() { if(override f = this->get_override("cancelmode")) f(); C::CancelMode(); }
+	void default_CancelMode() { C::CancelMode(); }
+
+	virtual void SetData(const Value& data) { if(override f = this->get_override("setdata")) f(data); C::SetData(data); }
+	void default_SetData(const Value& data) { C::SetData(data); }
+
+	virtual Value GetData() const { if(override f = this->get_override("getdata")) return f(); return C::GetData(); }
+	Value default_GetData() const { return C::GetData(); }
+
+	virtual void MouseMove(Point p, dword keyflags) { if(override f = this->get_override("mousemove")) f(p, keyflags); C::MouseMove(p, keyflags); }
+	void default_MouseMove(Point p, dword keyflags) { C::MouseMove(p, keyflags); }
+
+	virtual void MouseLeave() { if(override f = this->get_override("mouseleave")) f(); C::MouseLeave(); }
+	void default_MouseLeave() { C::MouseLeave(); }
+
+	virtual void LeftDown(Point p, dword keyflags) { if(override f = this->get_override("leftdown")) f(p, keyflags); C::LeftDown(p, keyflags); }
+	void default_LeftDown(Point p, dword keyflags) { C::LeftDown(p, keyflags); }
+
+	virtual void LeftUp(Point p, dword keyflags) { if(override f = this->get_override("leftup")) f(p, keyflags); C::LeftUp(p, keyflags); }
+	void default_LeftUp(Point p, dword keyflags) { C::LeftUp(p, keyflags); }
+
+	virtual void GotFocus() { if(override f = this->get_override("gotfocus")) f(); C::GotFocus(); }
+	void default_GotFocus() { C::GotFocus(); }
+
+	virtual void LostFocus() { if(override f = this->get_override("lostfocus")) f(); C::LostFocus(); }
+	void default_LostFocus() { C::LostFocus(); }
+
+	virtual bool Key(dword key, int count) { if(override f = this->get_override("key")) return f(key, count); return C::Key(key, count); }
+	bool default_Key(dword key, int count) { return C::Key(key, count); }
+
+	virtual bool HotKey(dword key) { if(override f = this->get_override("hotkey")) return f(key); return C::HotKey(key); }
+	bool default_HotKey(dword key) { return C::HotKey(key); }
+
+	virtual dword GetAccessKeys() const { if(override f = this->get_override("getaccesskeys")) return f(); return C::GetAccessKeys(); }
+	dword default_GetAccessKeys() const { return C::GetAccessKeys(); }
+
+	virtual void AssignAccessKeys(dword key) { if(override f = this->get_override("assignaccesskeys")) f(key); C::AssignAccessKeys(key); }
+	void default_AssignAccessKeys(dword key) { C::AssignAccessKeys(key); }
+};
+
 void SwitchSetLabel(Switch& c, const String& s) { c.SetLabel(s); }
+void SwitchMinCaseHeight(Switch& c, int cy) { c.MinCaseHeight(cy); }
+
+void SwitchSet(Switch& c, int i, const Value& v, const String& s) { c.Set(i, v, s); }
+void SwitchAdd(Switch& c, const Value& v, const String& s) { c.Add(v, s); }
 
 void export_Switch()
 {
 ONCELOCK
 {
 	class_<Switch, bases<Ctrl>, boost::noncopyable>("Switch", "Upp Switch")
+		.def("setdata", &Switch::SetData, &SwitchWrap::default_SetData)
+		.def("getdata", &Switch::GetData, &SwitchWrap::default_GetData)
+		.def("cancelmode", &Switch::CancelMode, &SwitchWrap::default_CancelMode)
+		.def("leftdown", &Switch::LeftDown, &SwitchWrap::default_LeftDown)
+		.def("leftup", &Switch::LeftUp, &SwitchWrap::default_LeftUp)
+		.def("mousemove", &Switch::MouseMove, &SwitchWrap::default_MouseMove)
+		.def("mouseleave", &Switch::MouseLeave, &SwitchWrap::default_MouseLeave)
+		.def("gotfocus", &Switch::GotFocus, &SwitchWrap::default_GotFocus)
+		.def("lostfocus", &Switch::LostFocus, &SwitchWrap::default_LostFocus)
+		.def("key", &Switch::Key, &SwitchWrap::default_Key)
+		.def("getaccesskeys", &Switch::GetAccessKeys, &SwitchWrap::default_GetAccessKeys)
+		.def("assignaccesskeys", &Switch::AssignAccessKeys, &SwitchWrap::default_AssignAccessKeys)
+		.def("hotkey", &Switch::HotKey, &SwitchWrap::default_HotKey)
+
+		.def("set", &SwitchSet)
+		.def("add", &SwitchAdd)
+
+		.def("enablecase", &Switch::EnableCase)
+		.def("enablevalue", &Switch::EnableValue)
+		.def("reset", &Switch::Reset)
+		.def("mincaseheight", &SwitchMinCaseHeight)
+
 		.add_property("label", (String (Switch::*)() const)&Switch::GetLabel, &SwitchSetLabel)
 	;
 }
diff --git a/bazaar/CtrlLibBoostPy/template.cpp b/bazaar/CtrlLibBoostPy/template.cpp
new file mode 100644
index 000000000..d8239994b
--- /dev/null
+++ b/bazaar/CtrlLibBoostPy/template.cpp
@@ -0,0 +1,14 @@
+#include "Common.h"
+using namespace boost::python;
+
+NAMESPACE_UPP
+
+void export_Foo()
+{
+ONCELOCK
+{
+
+}
+}
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/CtrlProp.upp b/bazaar/CtrlProp/CtrlProp.upp
index 58b7f8abc..9e2e08d52 100644
--- a/bazaar/CtrlProp/CtrlProp.upp
+++ b/bazaar/CtrlProp/CtrlProp.upp
@@ -9,7 +9,6 @@ uses
 
 file
 	CtrlPropCommon.h,
-	CtrlPropCommon.cpp,
 	CtrlPropEdit.h,
 	CtrlPropEdit.cpp,
 	CtrlPropEdit.lay,
diff --git a/bazaar/CtrlProp/CtrlPropCommon.cpp b/bazaar/CtrlProp/CtrlPropCommon.cpp
deleted file mode 100644
index 2e3fff268..000000000
--- a/bazaar/CtrlProp/CtrlPropCommon.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "CtrlPropCommon.h"
-
-VectorMap<String, int> BidirProps(Ctrl& c)
-{
-	VectorMap<String, int> is;
-
-	Value vs;
-	Props<Ctrl>::Get(c, "listset", vs);
-	if(!vs.Is<ValueArray>()) return is;
-	ValueArray vas = vs;
-	for(int i = 0; i < vas.GetCount(); i++)
-	{
-		int& m = is.GetAdd(vas.Get(i), 0);
-		m |= 1;
-	}
-
-	Value vg;
-	Props<Ctrl>::Get(c, "listget", vg);
-	if(!vg.Is<ValueArray>()) return is;
-	ValueArray vag = vg;
-	for(int i = 0; i < vag.GetCount(); i++)
-	{
-		int& m = is.GetAdd(vag.Get(i), 0);
-		m |= 2;
-	}
-
-	return is;
-}
diff --git a/bazaar/CtrlProp/CtrlPropCommon.h b/bazaar/CtrlProp/CtrlPropCommon.h
index f8b557d2b..e75d6374a 100644
--- a/bazaar/CtrlProp/CtrlPropCommon.h
+++ b/bazaar/CtrlProp/CtrlPropCommon.h
@@ -6,8 +6,6 @@ using namespace Upp;
 
 #include <Property/Property.h>
 
-VectorMap<String, int> BidirProps(Ctrl& c);
-
 //////////////////////
 
 DEC_PROPERTIES(Ctrl, EmptyClass)
diff --git a/bazaar/CtrlProp/CtrlPropEdit.cpp b/bazaar/CtrlProp/CtrlPropEdit.cpp
index 0854e0a3f..43e231a57 100644
--- a/bazaar/CtrlProp/CtrlPropEdit.cpp
+++ b/bazaar/CtrlProp/CtrlPropEdit.cpp
@@ -49,12 +49,6 @@ PropList::PropList()
 	//cancel <<= THISBACK(Rejector);
 }
 
-void PropList::Acceptor()
-{
-	plc.Clear();	
-	PopUpC::Acceptor();
-}
-
 //
 
 PropEditCtrl::PropEditCtrl()
@@ -92,47 +86,52 @@ void PropEditCtrl::Visit(Ctrl& e)
 		ac.Set(k, 1, v); //forwarded to controls when specified
 
 		if(a.get && a.set)	
+		{
+			Tuple2<bool, Value>& tv = vsav.Add(tag);
+			tv.a = false;
+			tv.b = v;
+		
+			Ctrl* pc;
+			if(!v.IsNull())
 			{
-				Tuple2<bool, Value>& tv = vsav.Add(tag);
-				tv.a = false;
-				tv.b = v;
-			
-				Ctrl* pc;
-				if(!v.IsNull())
+				pc = DefaultValueEditor(v);
 				{
-					pc = DefaultValueEditor(v);
-					{
-						LogPosCtrl* ple = dynamic_cast<LogPosCtrl*>(pc);
-						if(ple)
-							ple->Set(e);
-					}
+					LogPosCtrl* ple = dynamic_cast<LogPosCtrl*>(pc);
+					if(ple)
+						ple->Set(e);
 				}
-				else pc = new ValueCtrl();
-				(*pc) <<= THISBACK(OnUpdateRow);
-
-				ac.SetCtrl(k, 1, pc); //owned
-				++k;
 			}
+			else pc = new ValueCtrl();
+			(*pc) <<= THISBACK(OnUpdateRow);
+
+			ac.SetCtrl(k, 1, pc); //owned
+			++k;
+		}
 		else
 		if(a.get)
-			{
-				StaticText* pc = new StaticText();
-				pc->SetText(AsString(v));
+		{
+			StaticText* pc = new StaticText();
+			pc->SetText(AsString(v));
 
-				ac.SetCtrl(k, 1, pc); //owned
-				++k;
-			}
+			ac.SetCtrl(k, 1, pc); //owned
+			++k;
+		}
 		else
 		if(a.set)
-			{
-				//FIXME needs to know which type
-				//meanwhile, we let user choose
-				ValueCtrl* pc = new ValueCtrl();
-				(*pc) <<= THISBACK(OnUpdateRow);
+		{
+			//FIXME needs to know which type
+			//meanwhile, we let user choose
+			ValueCtrl* pc = new ValueCtrl();
+			(*pc) <<= THISBACK(OnUpdateRow);
 
-				ac.SetCtrl(k, 1, pc); //owned
-				++k;
-			}
+			ac.SetCtrl(k, 1, pc); //owned
+			++k;
+		}
+		else
+		{
+			ASSERT(0); //Property without accessors
+			++k;	
+		}
 	}
 	ac.Layout();
 	//ac.UpdateRefresh();
@@ -196,16 +195,3 @@ PropEdit::PropEdit()
 	ok.SetLabel("OK");
 	cancel.SetLabel("Cancel");
 }
-
-void PropEdit::Rejector()
-{
-	pec.Restore();
-	pec.Clear();	
-	PopUpC::Rejector();
-}
-
-void PropEdit::Acceptor()
-{
-	pec.Clear();	
-	PopUpC::Acceptor();
-}
diff --git a/bazaar/CtrlProp/CtrlPropEdit.h b/bazaar/CtrlProp/CtrlPropEdit.h
index 052ea5e61..3619de395 100644
--- a/bazaar/CtrlProp/CtrlPropEdit.h
+++ b/bazaar/CtrlProp/CtrlPropEdit.h
@@ -31,7 +31,7 @@ public:
 	PropList();
 
 	void PopUp(Ctrl* owner, Ctrl& e) { plc.Visit(e); PopUpC::PopUp(owner); }
-	virtual void Acceptor();
+	virtual void Acceptor() { plc.Clear(); PopUpC::Acceptor(); }
 
 protected:
 	PropListCtrl plc;
@@ -67,8 +67,8 @@ public:
 
 	void PopUp(Ctrl* owner, Ctrl& e) { pec.Visit(e); PopUpC::PopUp(owner); }
 
-	virtual void Rejector();
-	virtual void Acceptor();
+	virtual void Rejector() { pec.Restore(); pec.Clear(); PopUpC::Rejector(); }
+	virtual void Acceptor() { pec.Clear(); PopUpC::Acceptor(); }
 
 protected:
 	PropEditCtrl pec;
diff --git a/bazaar/RectCtrlTest/init b/bazaar/RectCtrlTest/init
new file mode 100644
index 000000000..7d5c66168
--- /dev/null
+++ b/bazaar/RectCtrlTest/init
@@ -0,0 +1,5 @@
+#ifndef _RectCtrlTest_icpp_init_stub
+#define _RectCtrlTest_icpp_init_stub
+#include "CtrlLib/init"
+#include "RectCtrl/init"
+#endif