Almost there

Just check bugs